From 15572b01833910a3b65edcc28eaa28968847fe71 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 26 Oct 2022 22:58:21 -0400 Subject: [PATCH] Deprecate GtkFontChooser and implementations These are being replaced by GtkFontDialog and GtkFontDialogButton This commit only moves the headers for GtkFontChooserWidget and GtkFontChooserDialog to deprecated/, and keeps the implementations in gtk/, since they will eventually be salvaged into a private GtkFontChooserWindow. --- demos/gtk-demo/fishbowl.c | 2 + gtk/{ => deprecated}/gtkfontbutton.c | 24 ++++++++ gtk/{ => deprecated}/gtkfontbutton.h | 20 +++---- gtk/{ => deprecated}/gtkfontchooser.c | 62 ++++++++++++++++++++ gtk/{ => deprecated}/gtkfontchooser.h | 38 ++++++------ gtk/{ => deprecated}/gtkfontchooserdialog.h | 2 +- gtk/{ => deprecated}/gtkfontchooserprivate.h | 0 gtk/{ => deprecated}/gtkfontchooserwidget.h | 2 +- gtk/deprecated/meson.build | 6 ++ gtk/gtk.h | 8 +-- gtk/gtkfontchooserdialog.c | 10 +++- gtk/gtkfontchooserdialogprivate.h | 2 +- gtk/gtkfontchooserutils.c | 2 + gtk/gtkfontchooserutils.h | 2 +- gtk/gtkfontchooserwidget.c | 10 +++- gtk/gtkfontchooserwidgetprivate.h | 2 +- gtk/gtkfontdialog.c | 6 +- gtk/meson.build | 6 -- tests/testfontchooserdialog.c | 2 + 19 files changed, 157 insertions(+), 49 deletions(-) rename gtk/{ => deprecated}/gtkfontbutton.c (98%) rename gtk/{ => deprecated}/gtkfontbutton.h (92%) rename gtk/{ => deprecated}/gtkfontchooser.c (90%) rename gtk/{ => deprecated}/gtkfontchooser.h (94%) rename gtk/{ => deprecated}/gtkfontchooserdialog.h (98%) rename gtk/{ => deprecated}/gtkfontchooserprivate.h (100%) rename gtk/{ => deprecated}/gtkfontchooserwidget.h (98%) diff --git a/demos/gtk-demo/fishbowl.c b/demos/gtk-demo/fishbowl.c index 8c39ef6014..eb5a35309f 100644 --- a/demos/gtk-demo/fishbowl.c +++ b/demos/gtk-demo/fishbowl.c @@ -68,11 +68,13 @@ create_blurred_button (void) return w; } +G_GNUC_BEGIN_IGNORE_DEPRECATIONS static GtkWidget * create_font_button (void) { return gtk_font_button_new (); } +G_GNUC_END_IGNORE_DEPRECATIONS static GtkWidget * create_level_bar (void) diff --git a/gtk/gtkfontbutton.c b/gtk/deprecated/gtkfontbutton.c similarity index 98% rename from gtk/gtkfontbutton.c rename to gtk/deprecated/gtkfontbutton.c index ef8f64c2b5..2a6f037e3c 100644 --- a/gtk/gtkfontbutton.c +++ b/gtk/deprecated/gtkfontbutton.c @@ -45,6 +45,8 @@ #include +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + /** * GtkFontButton: * @@ -65,6 +67,8 @@ * * `GtkFontButton` has a single CSS node with name fontbutton which * contains a button node with the .font style class. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ typedef struct _GtkFontButtonClass GtkFontButtonClass; @@ -744,6 +748,8 @@ gtk_font_button_get_property (GObject *object, * Creates a new font picker widget. * * Returns: a new font picker widget. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ GtkWidget * gtk_font_button_new (void) @@ -758,6 +764,8 @@ gtk_font_button_new (void) * Creates a new font picker widget showing the given font. * * Returns: a new font picker widget. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ GtkWidget * gtk_font_button_new_with_font (const char *fontname) @@ -771,6 +779,8 @@ gtk_font_button_new_with_font (const char *fontname) * @title: a string containing the font chooser dialog title * * Sets the title for the font chooser dialog. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ void gtk_font_button_set_title (GtkFontButton *font_button, @@ -797,6 +807,8 @@ gtk_font_button_set_title (GtkFontButton *font_button, * * Returns: an internal copy of the title string * which must not be freed. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ const char * gtk_font_button_get_title (GtkFontButton *font_button) @@ -812,6 +824,8 @@ gtk_font_button_get_title (GtkFontButton *font_button) * @modal: %TRUE to make the dialog modal * * Sets whether the dialog should be modal. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ void gtk_font_button_set_modal (GtkFontButton *font_button, @@ -837,6 +851,8 @@ gtk_font_button_set_modal (GtkFontButton *font_button, * Gets whether the dialog is modal. * * Returns: %TRUE if the dialog is modal + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ gboolean gtk_font_button_get_modal (GtkFontButton *font_button) @@ -853,6 +869,8 @@ gtk_font_button_get_modal (GtkFontButton *font_button) * Returns whether the selected font is used in the label. * * Returns: whether the selected font is used in the label. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ gboolean gtk_font_button_get_use_font (GtkFontButton *font_button) @@ -869,6 +887,8 @@ gtk_font_button_get_use_font (GtkFontButton *font_button) * * If @use_font is %TRUE, the font name will be written * using the selected font. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ void gtk_font_button_set_use_font (GtkFontButton *font_button, @@ -896,6 +916,8 @@ gtk_font_button_set_use_font (GtkFontButton *font_button, * Returns whether the selected size is used in the label. * * Returns: whether the selected size is used in the label. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ gboolean gtk_font_button_get_use_size (GtkFontButton *font_button) @@ -913,6 +935,8 @@ gtk_font_button_get_use_size (GtkFontButton *font_button) * * If @use_size is %TRUE, the font name will be written using * the selected size. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialogButton] instead */ void gtk_font_button_set_use_size (GtkFontButton *font_button, diff --git a/gtk/gtkfontbutton.h b/gtk/deprecated/gtkfontbutton.h similarity index 92% rename from gtk/gtkfontbutton.h rename to gtk/deprecated/gtkfontbutton.h index 58fc881f5b..e1a449506a 100644 --- a/gtk/gtkfontbutton.h +++ b/gtk/deprecated/gtkfontbutton.h @@ -43,29 +43,29 @@ typedef struct _GtkFontButton GtkFontButton; GDK_AVAILABLE_IN_ALL GType gtk_font_button_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget *gtk_font_button_new (void); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget *gtk_font_button_new_with_font (const char *fontname); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 const char * gtk_font_button_get_title (GtkFontButton *font_button); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_button_set_title (GtkFontButton *font_button, const char *title); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 gboolean gtk_font_button_get_modal (GtkFontButton *font_button); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_button_set_modal (GtkFontButton *font_button, gboolean modal); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 gboolean gtk_font_button_get_use_font (GtkFontButton *font_button); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_button_set_use_font (GtkFontButton *font_button, gboolean use_font); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 gboolean gtk_font_button_get_use_size (GtkFontButton *font_button); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_button_set_use_size (GtkFontButton *font_button, gboolean use_size); diff --git a/gtk/gtkfontchooser.c b/gtk/deprecated/gtkfontchooser.c similarity index 90% rename from gtk/gtkfontchooser.c rename to gtk/deprecated/gtkfontchooser.c index bf79f229c5..94fccd3f45 100644 --- a/gtk/gtkfontchooser.c +++ b/gtk/deprecated/gtkfontchooser.c @@ -25,6 +25,8 @@ #include "gtktypebuiltins.h" #include "gtkprivate.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + /** * GtkFontChooser: * @@ -34,6 +36,9 @@ * In GTK, the main objects that implement this interface are * [class@Gtk.FontChooserWidget], [class@Gtk.FontChooserDialog] and * [class@Gtk.FontButton]. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ enum @@ -167,6 +172,9 @@ gtk_font_chooser_default_init (GtkFontChooserInterface *iface) * * Returns: (nullable) (transfer none): A `PangoFontFamily` representing the * selected font family + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ PangoFontFamily * gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser) @@ -187,6 +195,9 @@ gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser) * * Returns: (nullable) (transfer none): A `PangoFontFace` representing the * selected font group details + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ PangoFontFace * gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser) @@ -204,6 +215,9 @@ gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser) * * Returns: A n integer representing the selected font size, * or -1 if no font size is selected. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ int gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser) @@ -230,6 +244,9 @@ gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser) * * Returns: (nullable) (transfer full): A string with the name * of the current font + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ char * gtk_font_chooser_get_font (GtkFontChooser *fontchooser) @@ -250,6 +267,9 @@ gtk_font_chooser_get_font (GtkFontChooser *fontchooser) * @fontname: a font name like “Helvetica 12” or “Times Bold 18” * * Sets the currently-selected font. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_font (GtkFontChooser *fontchooser, @@ -278,6 +298,9 @@ gtk_font_chooser_set_font (GtkFontChooser *fontchooser, * * Returns: (nullable) (transfer full): A `PangoFontDescription` for the * current font + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ PangoFontDescription * gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser) @@ -297,6 +320,9 @@ gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser) * @font_desc: a `PangoFontDescription` * * Sets the currently-selected font from @font_desc. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser, @@ -315,6 +341,9 @@ gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser, * Gets the text displayed in the preview area. * * Returns: (transfer full): the text displayed in the preview area + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ char * gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser) @@ -336,6 +365,9 @@ gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser) * Sets the text displayed in the preview area. * * The @text is used to show how the selected font looks. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser, @@ -354,6 +386,9 @@ gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser, * Returns whether the preview entry is shown or not. * * Returns: %TRUE if the preview entry is shown or %FALSE if it is hidden. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ gboolean gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser) @@ -373,6 +408,9 @@ gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser) * @show_preview_entry: whether to show the editable preview entry or not * * Shows or hides the editable preview entry. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser, @@ -393,6 +431,9 @@ gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser, * * Adds a filter function that decides which fonts to display * in the font chooser. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_filter_func (GtkFontChooser *fontchooser, @@ -447,6 +488,9 @@ _gtk_font_chooser_font_activated (GtkFontChooser *chooser, * context = gtk_widget_get_pango_context (label); * pango_context_set_font_map (context, fontmap); * ``` + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser, @@ -467,6 +511,9 @@ gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser, * or %NULL if it does not have one. * * Returns: (nullable) (transfer full): a `PangoFontMap` + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ PangoFontMap * gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser) @@ -487,6 +534,9 @@ gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser) * @level: the desired level of granularity * * Sets the desired level of granularity for selecting fonts. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_level (GtkFontChooser *fontchooser, @@ -504,6 +554,9 @@ gtk_font_chooser_set_level (GtkFontChooser *fontchooser, * Returns the current level of granularity for selecting fonts. * * Returns: the current granularity level + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ GtkFontChooserLevel gtk_font_chooser_get_level (GtkFontChooser *fontchooser) @@ -528,6 +581,9 @@ gtk_font_chooser_get_level (GtkFontChooser *fontchooser) * It can be passed to [func@Pango.AttrFontFeatures.new]. * * Returns: the currently selected font features + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ char * gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser) @@ -548,6 +604,9 @@ gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser) * Gets the language that is used for font features. * * Returns: the currently selected language + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ char * gtk_font_chooser_get_language (GtkFontChooser *fontchooser) @@ -567,6 +626,9 @@ gtk_font_chooser_get_language (GtkFontChooser *fontchooser) * @language: a language * * Sets the language to use for font features. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] and [class@GtkFontDialogButton] + * instead */ void gtk_font_chooser_set_language (GtkFontChooser *fontchooser, diff --git a/gtk/gtkfontchooser.h b/gtk/deprecated/gtkfontchooser.h similarity index 94% rename from gtk/gtkfontchooser.h rename to gtk/deprecated/gtkfontchooser.h index 95aa518b3f..09b3e79cd0 100644 --- a/gtk/gtkfontchooser.h +++ b/gtk/deprecated/gtkfontchooser.h @@ -107,57 +107,57 @@ struct _GtkFontChooserIface GDK_AVAILABLE_IN_ALL GType gtk_font_chooser_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 PangoFontFamily *gtk_font_chooser_get_font_family (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 PangoFontFace *gtk_font_chooser_get_font_face (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 int gtk_font_chooser_get_font_size (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 PangoFontDescription * gtk_font_chooser_get_font_desc (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_font_desc (GtkFontChooser *fontchooser, const PangoFontDescription *font_desc); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 char * gtk_font_chooser_get_font (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_font (GtkFontChooser *fontchooser, const char *fontname); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 char * gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_preview_text (GtkFontChooser *fontchooser, const char *text); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 gboolean gtk_font_chooser_get_show_preview_entry (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_show_preview_entry (GtkFontChooser *fontchooser, gboolean show_preview_entry); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_filter_func (GtkFontChooser *fontchooser, GtkFontFilterFunc filter, gpointer user_data, GDestroyNotify destroy); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_font_map (GtkFontChooser *fontchooser, PangoFontMap *fontmap); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 PangoFontMap * gtk_font_chooser_get_font_map (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_level (GtkFontChooser *fontchooser, GtkFontChooserLevel level); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkFontChooserLevel gtk_font_chooser_get_level (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 char * gtk_font_chooser_get_font_features (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 char * gtk_font_chooser_get_language (GtkFontChooser *fontchooser); -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 void gtk_font_chooser_set_language (GtkFontChooser *fontchooser, const char *language); diff --git a/gtk/gtkfontchooserdialog.h b/gtk/deprecated/gtkfontchooserdialog.h similarity index 98% rename from gtk/gtkfontchooserdialog.h rename to gtk/deprecated/gtkfontchooserdialog.h index b14ee81c2d..ca1d9e4a1f 100644 --- a/gtk/gtkfontchooserdialog.h +++ b/gtk/deprecated/gtkfontchooserdialog.h @@ -34,7 +34,7 @@ typedef struct _GtkFontChooserDialog GtkFontChooserDialog; GDK_AVAILABLE_IN_ALL GType gtk_font_chooser_dialog_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget* gtk_font_chooser_dialog_new (const char *title, GtkWindow *parent); diff --git a/gtk/gtkfontchooserprivate.h b/gtk/deprecated/gtkfontchooserprivate.h similarity index 100% rename from gtk/gtkfontchooserprivate.h rename to gtk/deprecated/gtkfontchooserprivate.h diff --git a/gtk/gtkfontchooserwidget.h b/gtk/deprecated/gtkfontchooserwidget.h similarity index 98% rename from gtk/gtkfontchooserwidget.h rename to gtk/deprecated/gtkfontchooserwidget.h index d3f668049b..f0d1c49099 100644 --- a/gtk/gtkfontchooserwidget.h +++ b/gtk/deprecated/gtkfontchooserwidget.h @@ -35,7 +35,7 @@ typedef struct _GtkFontChooserWidget GtkFontChooserWidget; GDK_AVAILABLE_IN_ALL GType gtk_font_chooser_widget_get_type (void) G_GNUC_CONST; -GDK_AVAILABLE_IN_ALL +GDK_DEPRECATED_IN_4_10 GtkWidget* gtk_font_chooser_widget_new (void); G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkFontChooserWidget, g_object_unref) diff --git a/gtk/deprecated/meson.build b/gtk/deprecated/meson.build index ae5012bb5b..3e1051825d 100644 --- a/gtk/deprecated/meson.build +++ b/gtk/deprecated/meson.build @@ -24,6 +24,8 @@ gtk_deprecated_sources = [ 'deprecated/gtkcombobox.c', 'deprecated/gtkcomboboxtext.c', 'deprecated/gtkentrycompletion.c', + 'deprecated/gtkfontbutton.c', + 'deprecated/gtkfontchooser.c', 'deprecated/gtkiconview.c', 'deprecated/gtkliststore.c', 'deprecated/gtkrender.c', @@ -69,6 +71,10 @@ gtk_deprecated_headers = [ 'deprecated/gtkcombobox.h', 'deprecated/gtkcomboboxtext.h', 'deprecated/gtkentrycompletion.h', + 'deprecated/gtkfontbutton.h', + 'deprecated/gtkfontchooser.h', + 'deprecated/gtkfontchooserdialog.h', + 'deprecated/gtkfontchooserwidget.h', 'deprecated/gtkiconview.h', 'deprecated/gtkliststore.h', 'deprecated/gtkrender.h', diff --git a/gtk/gtk.h b/gtk/gtk.h index a33ad62bc9..1444da20ed 100644 --- a/gtk/gtk.h +++ b/gtk/gtk.h @@ -135,10 +135,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c index c10c214bb2..fc640ce540 100644 --- a/gtk/gtkfontchooserdialog.c +++ b/gtk/gtkfontchooserdialog.c @@ -22,8 +22,8 @@ #include #include "gtkfontchooserdialogprivate.h" -#include "gtkfontchooser.h" -#include "gtkfontchooserwidget.h" +#include "deprecated/gtkfontchooser.h" +#include "deprecated/gtkfontchooserwidget.h" #include "gtkfontchooserwidgetprivate.h" #include "gtkfontchooserutils.h" #include "gtkbox.h" @@ -38,6 +38,8 @@ #include "gtkactionable.h" #include "gtkeventcontrollerkey.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + typedef struct _GtkFontChooserDialogClass GtkFontChooserDialogClass; struct _GtkFontChooserDialog @@ -72,6 +74,8 @@ struct _GtkFontChooserDialogClass * The `GtkFontChooserDialog` implementation of the `GtkBuildable` * interface exposes the buttons with the names “select_button” * and “cancel_button”. + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] instead */ static void gtk_font_chooser_dialog_buildable_interface_init (GtkBuildableIface *iface); @@ -288,6 +292,8 @@ gtk_font_chooser_dialog_init (GtkFontChooserDialog *dialog) * Creates a new `GtkFontChooserDialog`. * * Returns: a new `GtkFontChooserDialog` + * + * Deprecated: 4.10: Use [class@Gtk.FontDialog] instead */ GtkWidget* gtk_font_chooser_dialog_new (const char *title, diff --git a/gtk/gtkfontchooserdialogprivate.h b/gtk/gtkfontchooserdialogprivate.h index e57685e9ec..5020714a58 100644 --- a/gtk/gtkfontchooserdialogprivate.h +++ b/gtk/gtkfontchooserdialogprivate.h @@ -18,7 +18,7 @@ #ifndef __GTK_FONT_CHOOSER_DIALOG_PRIVATE_H__ #define __GTK_FONT_CHOOSER_DIALOG_PRIVATE_H__ -#include "gtkfontchooserdialog.h" +#include "deprecated/gtkfontchooserdialog.h" #include "gtkfilter.h" G_BEGIN_DECLS diff --git a/gtk/gtkfontchooserutils.c b/gtk/gtkfontchooserutils.c index 6dd2a3fd9d..d0d70bd7cb 100644 --- a/gtk/gtkfontchooserutils.c +++ b/gtk/gtkfontchooserutils.c @@ -26,6 +26,8 @@ #include "gtkfontchooserutils.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + static GtkFontChooser * get_delegate (GtkFontChooser *receiver) { diff --git a/gtk/gtkfontchooserutils.h b/gtk/gtkfontchooserutils.h index ac7bf18558..7ddade5126 100644 --- a/gtk/gtkfontchooserutils.h +++ b/gtk/gtkfontchooserutils.h @@ -25,7 +25,7 @@ #ifndef __GTK_FONT_CHOOSER_UTILS_H__ #define __GTK_FONT_CHOOSER_UTILS_H__ -#include "gtkfontchooserprivate.h" +#include "deprecated/gtkfontchooserprivate.h" G_BEGIN_DECLS diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index dcacae2e10..fb73a5376a 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -21,7 +21,7 @@ #include #include -#include "gtkfontchooserwidget.h" +#include "deprecated/gtkfontchooserwidget.h" #include "gtkfontchooserwidgetprivate.h" #include "gtkadjustment.h" @@ -34,7 +34,7 @@ #include "gtkfilter.h" #include "gtkframe.h" #include "gtkgrid.h" -#include "gtkfontchooser.h" +#include "deprecated/gtkfontchooser.h" #include "gtkfontchooserutils.h" #include #include "gtklabel.h" @@ -70,6 +70,8 @@ #include "language-names.h" #include "open-type-layout.h" +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + /** * GtkFontChooserWidget: * @@ -90,6 +92,8 @@ * # CSS nodes * * `GtkFontChooserWidget` has a single CSS node with name fontchooser. + * + * Deprecated: 4.10: Direct use of `GtkFontChooserWidget` is deprecated. */ typedef struct _GtkFontChooserWidgetClass GtkFontChooserWidgetClass; @@ -1299,6 +1303,8 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *self) * Creates a new `GtkFontChooserWidget`. * * Returns: a new `GtkFontChooserWidget` + * + * Deprecated: 4.10: Direct use of `GtkFontChooserWidget` is deprecated. */ GtkWidget * gtk_font_chooser_widget_new (void) diff --git a/gtk/gtkfontchooserwidgetprivate.h b/gtk/gtkfontchooserwidgetprivate.h index ac8e7dc7c0..80d1400c58 100644 --- a/gtk/gtkfontchooserwidgetprivate.h +++ b/gtk/gtkfontchooserwidgetprivate.h @@ -18,7 +18,7 @@ #ifndef __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__ #define __GTK_FONT_CHOOSER_WIDGET_PRIVATE_H__ -#include "gtkfontchooserwidget.h" +#include "deprecated/gtkfontchooserwidget.h" #include "gtkfilter.h" G_BEGIN_DECLS diff --git a/gtk/gtkfontdialog.c b/gtk/gtkfontdialog.c index bcbdc9371e..44d8757159 100644 --- a/gtk/gtkfontdialog.c +++ b/gtk/gtkfontdialog.c @@ -21,7 +21,7 @@ #include "gtkfontdialog.h" -#include "gtkfontchooser.h" +#include "deprecated/gtkfontchooser.h" #include "gtkfontchooserdialogprivate.h" #include "gtkbutton.h" #include "gtkdialogerror.h" @@ -502,6 +502,7 @@ typedef struct PangoLanguage *language; } FontResult; +G_GNUC_BEGIN_IGNORE_DEPRECATIONS static void response_cb (GTask *task, int response) @@ -568,6 +569,7 @@ response_cb (GTask *task, g_object_unref (task); } +G_GNUC_END_IGNORE_DEPRECATIONS static void dialog_response (GtkDialog *dialog, @@ -577,6 +579,7 @@ dialog_response (GtkDialog *dialog, response_cb (task, response); } +G_GNUC_BEGIN_IGNORE_DEPRECATIONS static GtkWidget * create_font_chooser (GtkFontDialog *self, GtkWindow *parent, @@ -605,6 +608,7 @@ create_font_chooser (GtkFontDialog *self, return window; } +G_GNUC_END_IGNORE_DEPRECATIONS /* }}} */ /* {{{ Async API */ diff --git a/gtk/meson.build b/gtk/meson.build index d5849712d6..7b294cbaa4 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -235,8 +235,6 @@ gtk_public_sources = files([ 'gtkfixedlayout.c', 'gtkflattenlistmodel.c', 'gtkflowbox.c', - 'gtkfontbutton.c', - 'gtkfontchooser.c', 'gtkfontchooserdialog.c', 'gtkfontchooserutils.c', 'gtkfontchooserwidget.c', @@ -494,10 +492,6 @@ gtk_public_headers = files([ 'gtkfixedlayout.h', 'gtkflattenlistmodel.h', 'gtkflowbox.h', - 'gtkfontbutton.h', - 'gtkfontchooser.h', - 'gtkfontchooserdialog.h', - 'gtkfontchooserwidget.h', 'gtkfontdialog.h', 'gtkfontdialogbutton.h', 'gtkframe.h', diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c index 0ff1f389ad..78b70969c7 100644 --- a/tests/testfontchooserdialog.c +++ b/tests/testfontchooserdialog.c @@ -24,6 +24,8 @@ #include +G_GNUC_BEGIN_IGNORE_DEPRECATIONS + static gboolean monospace_filter (const PangoFontFamily *family, const PangoFontFace *face, -- 2.30.2